realtek: rtl838x: drop SFP pseudo-PHYs and phy-handle

Remove all pseudo-PHYs and phy-handle properties from DTS of RTL838X
devices. RTL838X SerDes is now handled by PCS driver and thus not
treated as PHY anymore.

Signed-off-by: Jonas Jelonek <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20876
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts b/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts
index 06c1c2c71fd3d482859b5d05c2b8b145fe349fcb..dcc43281ef007a1cbe3fb64a7e04f59f39296e2c 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts
+++ b/target/linux/realtek/dts/rtl8380_d-link_dgs-1210-10mp-f.dts
@@ -84,9 +84,6 @@
        INTERNAL_PHY(13)
        INTERNAL_PHY(14)
        INTERNAL_PHY(15)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {
@@ -107,7 +104,6 @@
                        reg = <24>;
                        label = "lan9";
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp0>;
@@ -117,7 +113,6 @@
                        reg = <26>;
                        label = "lan10";
                        pcs-handle = <&serdes5>;
-                       phy-handle = <&phy26>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp1>;

diff --git a/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi b/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
index c1534b07d3155be8b421e40105a6fdc693dbe0f2..299487354740f4e12733117e33f00217070b4d2e 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
+++ b/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
@@ -180,9 +180,6 @@
        INTERNAL_PHY(13)
        INTERNAL_PHY(14)
        INTERNAL_PHY(15)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {
@@ -204,7 +201,6 @@
                        label = "lan9";
                        pcs-handle = <&serdes4>;
                        phy-mode = "1000base-x";
-                       phy-handle = <&phy24>;
                        managed = "in-band-status";
                        sfp = <&sfp0>;
                };
@@ -214,7 +210,6 @@
                        label = "lan10";
                        pcs-handle = <&serdes5>;
                        phy-mode = "1000base-x";
-                       phy-handle = <&phy26>;
                        managed = "in-band-status";
                        sfp = <&sfp1>;
                };

diff --git a/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi b/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi
index f47bb539c5e0a86911b3f6c43ae3629d3a43b823..e77e81ed5b05ebe6799b5764cda513117ef62449 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi
+++ b/target/linux/realtek/dts/rtl8380_hpe_1920-8g.dtsi
@@ -66,9 +66,6 @@
        INTERNAL_PHY(13)
        INTERNAL_PHY(14)
        INTERNAL_PHY(15)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {
@@ -89,7 +86,6 @@
                        reg = <24>;
                        label = "lan9";
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp0>;
@@ -99,7 +95,6 @@
                        reg = <26>;
                        label = "lan10";
                        pcs-handle = <&serdes5>;
-                       phy-handle = <&phy26>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp1>;

diff --git a/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts b/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
index 201d71a9e9d4bd5cb2a02c0b8a79465f59f77321..8a42b17c4a83ce260935a78a55d1983357eb2306 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
+++ b/target/linux/realtek/dts/rtl8380_linksys_lgs310c.dts
@@ -157,8 +157,6 @@
        INTERNAL_PHY(13)
        INTERNAL_PHY(14)
        INTERNAL_PHY(15)
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {
@@ -179,7 +177,6 @@
                        reg = <24>;
                        label = "lan9";
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp0>;
@@ -189,7 +186,6 @@
                        reg = <26>;
                        label = "lan10";
                        pcs-handle = <&serdes5>;
-                       phy-handle = <&phy26>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp1>;

diff --git a/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts b/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
index 636046ed1b64676650a23f736c20ce0c2786e769..6446925270b8673e3caa1bffa789aa00c73aadee 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_netgear_gs310tp-v1.dts
@@ -49,11 +49,6 @@
        status = "okay";
 };
 
-&mdio_bus0 {
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
-};
-
 &switch0 {
        ports {
                /* TODO: fixed link SFP is not right */
@@ -62,7 +57,6 @@
                        reg = <24>;
                        label = SWITCH_PORT_LABEL(9);
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        fixed-link {
                                speed = <1000>;
@@ -73,7 +67,6 @@
                        reg = <26>;
                        label = SWITCH_PORT_LABEL(10);
                        pcs-handle = <&serdes5>;
-                       phy-handle = <&phy26>;
                        phy-mode = "1000base-x";
                        fixed-link {
                                speed = <1000>;

diff --git a/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts b/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts
index 6e46039addc347e895cb7919ceb557f7ec105d3c..4ecf61646947a50122396fd5a1adc444499240b8 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts
+++ b/target/linux/realtek/dts/rtl8380_panasonic_m8eg-pn28080k.dts
@@ -83,8 +83,6 @@
        INTERNAL_PHY(13)
        INTERNAL_PHY(14)
        INTERNAL_PHY(15)
-
-       INTERNAL_PHY(24)
 };
 
 &switch0 {
@@ -105,7 +103,6 @@
                        reg = <24>;
                        label = "lan9";
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp0>;

diff --git a/target/linux/realtek/dts/rtl8380_tplink_sg2008p-v1.dts b/target/linux/realtek/dts/rtl8380_tplink_sg2008p-v1.dts
index bf43e412b1c6c3a54ed9ce3f3486c3a6e25e510e..69ee268f44585a04f25129e4ee83484ddd1aa62b 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_tplink_sg2008p-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_tplink_sg2008p-v1.dts
@@ -11,18 +11,3 @@
        status = "disabled";
 };
 
-&phy24 {
-       status = "disabled";
-};
-
-&phy26 {
-       status = "disabled";
-};
-
-&port24 {
-       status = "disabled";
-};
-
-&port26 {
-       status = "disabled";
-};

diff --git a/target/linux/realtek/dts/rtl8380_tplink_sg2210p-v3.dts b/target/linux/realtek/dts/rtl8380_tplink_sg2210p-v3.dts
index 4b0022c388903f607a9508bfa49fed64d446b067..708999fba624e3029125eead2cbbcc6ba5b2fe9a 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_tplink_sg2210p-v3.dts
+++ b/target/linux/realtek/dts/rtl8380_tplink_sg2210p-v3.dts
@@ -7,10 +7,29 @@
        model = "TP-Link SG2210P v3";
 };
 
-&port24 {
-       label = "lan-sfp2";
-};
+&switch0 {
+       ports {
+               port24: port@24 {
+                       reg = <24>;
+                       label = "lan-sfp2";
+                       pcs-handle = <&serdes4>;
+                       phy-mode = "1000base-x";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
 
-&port26 {
-       label = "lan-sfp1";
+               port26: port@26 {
+                       reg = <26>;
+                       label = "lan-sfp1";
+                       pcs-handle = <&serdes5>;
+                       phy-mode = "1000base-x";
+                       fixed-link {
+                               speed = <1000>;
+                               full-duplex;
+                       };
+               };
+       };
 };
+

diff --git a/target/linux/realtek/dts/rtl8380_tplink_sg2xxx.dtsi b/target/linux/realtek/dts/rtl8380_tplink_sg2xxx.dtsi
index 3854d5cf8b411d5a3d4d2299db786abd7b627aff..677eb0d92d3bc04a612b9dac6b97ebf5bf43e6f4 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_tplink_sg2xxx.dtsi
+++ b/target/linux/realtek/dts/rtl8380_tplink_sg2xxx.dtsi
@@ -143,9 +143,6 @@
        INTERNAL_PHY(13)
        INTERNAL_PHY(14)
        INTERNAL_PHY(15)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &ethernet0 {
@@ -172,7 +169,6 @@
                        reg = <24>;
                        label = SWITCH_PORT_LABEL(9);
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        fixed-link {
                                speed = <1000>;
@@ -183,7 +179,6 @@
                        reg = <26>;
                        label = SWITCH_PORT_LABEL(10);
                        pcs-handle = <&serdes5>;
-                       phy-handle = <&phy26>;
                        phy-mode = "1000base-x";
                        fixed-link {
                                speed = <1000>;

diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts
index f535f1d016f874d51b927e968a5bc271bb83dfd4..928ae93527fe4b8d123a84365ef348d2b6db06d1 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts
+++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp-a1.dts
@@ -52,18 +52,12 @@
        status = "okay";
 };
 
-&mdio_bus0 {
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
-};
-
 &switch0 {
        ports {
                port@24 {
                        reg = <24>;
                        label = "lan9";
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp0>;
@@ -73,7 +67,6 @@
                        reg = <26>;
                        label = "lan10";
                        pcs-handle = <&serdes5>;
-                       phy-handle = <&phy26>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp1>;

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
index a31a268c42af585b6b7050abecf74d5a746d52f6..3a9254be127c22238792d32cac1240c46cdc1bb0 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-10p.dts
@@ -83,9 +83,6 @@
        INTERNAL_PHY(13)
        INTERNAL_PHY(14)
        INTERNAL_PHY(15)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {
@@ -106,7 +103,6 @@
                        reg = <24>;
                        label = "lan9";
                        pcs-handle = <&serdes4>;
-                       phy-handle = <&phy24>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp0>;
@@ -116,7 +112,6 @@
                        reg = <26>;
                        label = "lan10";
                        pcs-handle = <&serdes5>;
-                       phy-handle = <&phy26>;
                        phy-mode = "1000base-x";
                        managed = "in-band-status";
                        sfp = <&sfp1>;

diff --git a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts
index 34611e101e6961858b942c5284287ce5a8c8c263..94e2f553c1ecab60a49810ce0693a200a1c65ce1 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts
+++ b/target/linux/realtek/dts/rtl8382_d-link_dgs-1210-26.dts
@@ -72,9 +72,6 @@
        EXTERNAL_PHY(21)
        EXTERNAL_PHY(22)
        EXTERNAL_PHY(23)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts
index 63c96a88ae5b5e97d3fb56ca748e89fe175cf33a..214f2c7afda68c24fa7bfca18304b6f3373dca15 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24-a1.dts
@@ -72,9 +72,6 @@
        EXTERNAL_PHY(21)
        EXTERNAL_PHY(22)
        EXTERNAL_PHY(23)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts
index 8c8bc0b2bafbef46ee3f1225b0b3bb25d943dd22..16abf9f2de68608a99c9ddb281bb155e17349ee7 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-a1.dts
@@ -72,9 +72,6 @@
        EXTERNAL_PHY(21)
        EXTERNAL_PHY(22)
        EXTERNAL_PHY(23)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {

diff --git a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts
index 42f631316ceec586a4564a4fa4ab35df84e5d5e9..900929808f5bc54a22d25f4afba845e451084730 100644 (file)
--- a/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts
+++ b/target/linux/realtek/dts/rtl8382_zyxel_gs1900-24hp-b1.dts
@@ -68,9 +68,6 @@
        EXTERNAL_PHY(21)
        EXTERNAL_PHY(22)
        EXTERNAL_PHY(23)
-
-       INTERNAL_PHY(24)
-       INTERNAL_PHY(26)
 };
 
 &switch0 {